Change in openvpn[master]: multi: make multi_process_float() static
A message that is not in the archive (sent off-list or not yet received): gerrit.1753487460000.Id5e06f0822a3e7e4ad1b6f93caaefdb6a8cfe547@...2715...
Attention is currently required from: flichtenheld, plaisthos.
Hello plaisthos, flichtenheld,
I'd like you to do a code review.
Please visit
http://gerrit.openvpn.net/c/openvpn/+/1115?usp=email
to review the following change.
Change subject: multi: make multi_process_float() static
......................................................................
multi: make multi_process_float() static
multi_process_float() is invoked only within multi.c, which is where it is defined.
For this reason we can make it static and drop its declaration in multi.h.
---
M src/openvpn/multi.c
M src/openvpn/multi.h
2 files changed, 9 insertions(+), 12 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/15/1115/1
src/openvpn/multi.c +9 -1
@@ -3210,7 +3210,15 @@return ret; } -void +/** +* Handles peer floating. +* +* If peer is floated to a taken address, either drops packet +* (if peer that owns address has different CN) or disconnects +* existing peer. Updates multi_instance with new address, +* updates hashtables in multi_context. +*/ +static void multi_process_float (struct multi_context *m,struct multi_instance *mi,struct link_socket *sock) {
src/openvpn/multi.h +0 -11
@@ -270,17 +270,6 @@bool multi_process_timeout (struct multi_context *m,const unsigned int mpp_flags); -/** -* Handles peer floating. -* -* If peer is floated to a taken address, either drops packet -* (if peer that owns address has different CN) or disconnects -* existing peer. Updates multi_instance with new address, -* updates hashtables in multi_context. -*/ -void multi_process_float (struct multi_context *m,struct multi_instance *mi, -struct link_socket *sock); -#define MPP_PRE_SELECT (1<<0)#define MPP_CONDITIONAL_PRE_SELECT (1<<1)#define MPP_CLOSE_ON_SIGNAL (1<<2)
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1115?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Id5e06f0822a3e7e4ad1b6f93caaefdb6a8cfe547
Gerrit-Change-Number: 1115
Gerrit-PatchSet: 1
Gerrit-Owner: ordex <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-MessageType: newchange
[Openvpn-devel] [S] Change in openvpn[master]: multi: make some multi_*() functions static
In reply to a message not in the archiveAttention is currently required from: flichtenheld, plaisthos.
Hello flichtenheld, plaisthos,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/1115?usp=email
to look at the new patch set (#2).
Change subject: multi: make some multi_*() functions static
......................................................................
multi: make some multi_*() functions static
multi_process_float() and multi_print_status() are both invoked only within multi.c, which is where they is defined.
For this reason we can make them static and drop their declaration from multi.h.
---
M src/openvpn/multi.c
M src/openvpn/multi.h
2 files changed, 10 insertions(+), 15 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/15/1115/2
src/openvpn/multi.c +10 -2
@@ -849,7 +849,7 @@* If status file is defined, write to file. * If status file is NULL, write to syslog. */ -void +static void multi_print_status (struct multi_context *m,struct status_output *so,const int version) {if (m->hash)
@@ -3210,7 +3210,15 @@return ret; } -void +/** +* Handles peer floating. +* +* If peer is floated to a taken address, either drops packet +* (if peer that owns address has different CN) or disconnects +* existing peer. Updates multi_instance with new address, +* updates hashtables in multi_context. +*/ +static void multi_process_float (struct multi_context *m,struct multi_instance *mi,struct link_socket *sock) {
src/openvpn/multi.h +0 -13
@@ -270,17 +270,6 @@bool multi_process_timeout (struct multi_context *m,const unsigned int mpp_flags); -/** -* Handles peer floating. -* -* If peer is floated to a taken address, either drops packet -* (if peer that owns address has different CN) or disconnects -* existing peer. Updates multi_instance with new address, -* updates hashtables in multi_context. -*/ -void multi_process_float (struct multi_context *m,struct multi_instance *mi, -struct link_socket *sock); -#define MPP_PRE_SELECT (1<<0)#define MPP_CONDITIONAL_PRE_SELECT (1<<1)#define MPP_CLOSE_ON_SIGNAL (1<<2)
@@ -370,8 +359,6 @@void multi_process_drop_outgoing_tun (struct multi_context *m,const unsigned int mpp_flags); -void multi_print_status (struct multi_context *m,struct status_output *so,const int version); -struct multi_instance *multi_get_queue (struct mbuf_set *ms); void multi_add_mbuf(struct multi_context *m,
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1115?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Id5e06f0822a3e7e4ad1b6f93caaefdb6a8cfe547
Gerrit-Change-Number: 1115
Gerrit-PatchSet: 2
Gerrit-Owner: ordex <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-MessageType: newpatchset
[Openvpn-devel] [S] Change in openvpn[master]: multi: make some multi_*() functions static
In reply to a message not in the archiveAttention is currently required from: flichtenheld, ordex, plaisthos.
cron2 has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/1115?usp=email )
Change subject: multi: make some multi_*() functions static
......................................................................
Patch Set 2: Code-Review+2
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1115?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Id5e06f0822a3e7e4ad1b6f93caaefdb6a8cfe547
Gerrit-Change-Number: 1115
Gerrit-PatchSet: 2
Gerrit-Owner: ordex <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Attention: ordex <[email protected]...>
Gerrit-Comment-Date: Sat, 26 Jul 2025 13:51:46 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
PATCH v2 1/1 multi: make some multi_*() functions static
In reply to a message not in the archiveFrom: Antonio Quartulli <[email protected]...>
multi_process_float() and multi_print_status() are both invoked only within multi.c, which is where they is defined.
For this reason we can make them static and drop their declaration from multi.h.
---
This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master.
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1115
This mail reflects revision 2 of this Change.
Acked-by according to Gerrit (reflected above):
Gert Doering <[email protected]...>
src/openvpn/multi.c +10 -2
@@ -849,7 +849,7 @@* If status file is defined, write to file. * If status file is NULL, write to syslog. */ -void +static void multi_print_status (struct multi_context *m,struct status_output *so,const int version) {if (m->hash)
@@ -3210,7 +3210,15 @@return ret; } -void +/** +* Handles peer floating. +* +* If peer is floated to a taken address, either drops packet +* (if peer that owns address has different CN) or disconnects +* existing peer. Updates multi_instance with new address, +* updates hashtables in multi_context. +*/ +static void multi_process_float (struct multi_context *m,struct multi_instance *mi,struct link_socket *sock) {
src/openvpn/multi.h +0 -13
@@ -270,17 +270,6 @@bool multi_process_timeout (struct multi_context *m,const unsigned int mpp_flags); -/** -* Handles peer floating. -* -* If peer is floated to a taken address, either drops packet -* (if peer that owns address has different CN) or disconnects -* existing peer. Updates multi_instance with new address, -* updates hashtables in multi_context. -*/ -void multi_process_float (struct multi_context *m,struct multi_instance *mi, -struct link_socket *sock); -#define MPP_PRE_SELECT (1<<0)#define MPP_CONDITIONAL_PRE_SELECT (1<<1)#define MPP_CLOSE_ON_SIGNAL (1<<2)
@@ -370,8 +359,6 @@void multi_process_drop_outgoing_tun (struct multi_context *m,const unsigned int mpp_flags); -void multi_print_status (struct multi_context *m,struct status_output *so,const int version); -struct multi_instance *multi_get_queue (struct mbuf_set *ms); void multi_add_mbuf(struct multi_context *m,
[Openvpn-devel] [PATCH applied] Re: multi: make some multi_*() functions static
Trivial enough :-) - I did check that #844 does not introduce calls to these functions "from elsewhere", and it doesn't. Compile- and client-side tested by the buildbot horde, all green.
Your patch has been applied to the master branch.
commit 3594f5901db17d9b57d8809c729ef24d4bbfddf5
Author: Antonio Quartulli Date: Sat Jul 26 15:51:56 2025 +0200
multi: make some multi_*() functions static
Signed-off-by: Antonio Quartulli <[email protected]...>
Acked-by: Gert Doering <[email protected]...>
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg32356.html
Signed-off-by: Gert Doering <[email protected]...>--
kind regards,
Gert Doering
[Openvpn-devel] [S] Change in openvpn[master]: multi: make some multi_*() functions static
In reply to a message not in the archivecron2 has uploaded a new patch set (#3) to the change originally created by ordex. ( http://gerrit.openvpn.net/c/openvpn/+/1115?usp=email )
The following approvals got outdated and were removed:
Code-Review+2 by cron2
Change subject: multi: make some multi_*() functions static
......................................................................
multi: make some multi_*() functions static
multi_process_float() and multi_print_status() are both invoked only within multi.c, which is where they is defined.
For this reason we can make them static and drop their declaration from multi.h.
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg32356.html
---
M src/openvpn/multi.c
M src/openvpn/multi.h
2 files changed, 10 insertions(+), 15 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/15/1115/3
src/openvpn/multi.c +10 -2
@@ -849,7 +849,7 @@* If status file is defined, write to file. * If status file is NULL, write to syslog. */ -void +static void multi_print_status (struct multi_context *m,struct status_output *so,const int version) {if (m->hash)
@@ -3210,7 +3210,15 @@return ret; } -void +/** +* Handles peer floating. +* +* If peer is floated to a taken address, either drops packet +* (if peer that owns address has different CN) or disconnects +* existing peer. Updates multi_instance with new address, +* updates hashtables in multi_context. +*/ +static void multi_process_float (struct multi_context *m,struct multi_instance *mi,struct link_socket *sock) {
src/openvpn/multi.h +0 -13
@@ -270,17 +270,6 @@bool multi_process_timeout (struct multi_context *m,const unsigned int mpp_flags); -/** -* Handles peer floating. -* -* If peer is floated to a taken address, either drops packet -* (if peer that owns address has different CN) or disconnects -* existing peer. Updates multi_instance with new address, -* updates hashtables in multi_context. -*/ -void multi_process_float (struct multi_context *m,struct multi_instance *mi, -struct link_socket *sock); -#define MPP_PRE_SELECT (1<<0)#define MPP_CONDITIONAL_PRE_SELECT (1<<1)#define MPP_CLOSE_ON_SIGNAL (1<<2)
@@ -370,8 +359,6 @@void multi_process_drop_outgoing_tun (struct multi_context *m,const unsigned int mpp_flags); -void multi_print_status (struct multi_context *m,struct status_output *so,const int version); -struct multi_instance *multi_get_queue (struct mbuf_set *ms); void multi_add_mbuf(struct multi_context *m,
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1115?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Id5e06f0822a3e7e4ad1b6f93caaefdb6a8cfe547
Gerrit-Change-Number: 1115
Gerrit-PatchSet: 3
Gerrit-Owner: ordex <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-MessageType: newpatchset
[Openvpn-devel] [S] Change in openvpn[master]: multi: make some multi_*() functions static
In reply to a message not in the archivecron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/1115?usp=email )
Change subject: multi: make some multi_*() functions static
......................................................................
multi: make some multi_*() functions static
multi_process_float() and multi_print_status() are both invoked only within multi.c, which is where they is defined.
For this reason we can make them static and drop their declaration from multi.h.
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg32356.html
---
M src/openvpn/multi.c
M src/openvpn/multi.h
2 files changed, 10 insertions(+), 15 deletions(-)
src/openvpn/multi.c +10 -2
@@ -849,7 +849,7 @@* If status file is defined, write to file. * If status file is NULL, write to syslog. */ -void +static void multi_print_status (struct multi_context *m,struct status_output *so,const int version) {if (m->hash)
@@ -3210,7 +3210,15 @@return ret; } -void +/** +* Handles peer floating. +* +* If peer is floated to a taken address, either drops packet +* (if peer that owns address has different CN) or disconnects +* existing peer. Updates multi_instance with new address, +* updates hashtables in multi_context. +*/ +static void multi_process_float (struct multi_context *m,struct multi_instance *mi,struct link_socket *sock) {
src/openvpn/multi.h +0 -13
@@ -270,17 +270,6 @@bool multi_process_timeout (struct multi_context *m,const unsigned int mpp_flags); -/** -* Handles peer floating. -* -* If peer is floated to a taken address, either drops packet -* (if peer that owns address has different CN) or disconnects -* existing peer. Updates multi_instance with new address, -* updates hashtables in multi_context. -*/ -void multi_process_float (struct multi_context *m,struct multi_instance *mi, -struct link_socket *sock); -#define MPP_PRE_SELECT (1<<0)#define MPP_CONDITIONAL_PRE_SELECT (1<<1)#define MPP_CLOSE_ON_SIGNAL (1<<2)
@@ -370,8 +359,6 @@void multi_process_drop_outgoing_tun (struct multi_context *m,const unsigned int mpp_flags); -void multi_print_status (struct multi_context *m,struct status_output *so,const int version); -struct multi_instance *multi_get_queue (struct mbuf_set *ms); void multi_add_mbuf(struct multi_context *m,
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1115?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Id5e06f0822a3e7e4ad1b6f93caaefdb6a8cfe547
Gerrit-Change-Number: 1115
Gerrit-PatchSet: 3
Gerrit-Owner: ordex <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-MessageType: merged